Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 1 Feb 2010 23:55:38 +0000 (23:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 1 Feb 2010 23:55:38 +0000 (23:55 +0000)

Trivial merge